Skip to content

manifest: sdk-zephyr: unclean cherry pick of power domain refactor and swext support #23837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Aug 11, 2025
Merged

manifest: sdk-zephyr: unclean cherry pick of power domain refactor and swext support #23837

merged 6 commits into from
Aug 11, 2025

Conversation

@NordicBuilder
Copy link
Contributor

@NordicBuilder NordicBuilder commented Aug 7, 2025 •
edited by gchwier
Loading

Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#3175

test_sdk_mcuboot: grch_23837_unclean_cherry_pick_of_power_domain

@NordicBuilder NordicBuilder requested review from a team as code owners August 7, 2025 14:19
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Aug 7, 2025
@NordicBuilder
Copy link
Contributor Author

NordicBuilder commented Aug 7, 2025 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@05a6339 nrfconnect/sdk-mcuboot@79aa437 (ncs-v3.1-branch) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@0351d6e nrfconnect/sdk-zephyr@9f27eaa (ncs-v3.1-branch) nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@bjarki-andreasen bjarki-andreasen requested a review from a team August 7, 2025 14:21
@bjarki-andreasen bjarki-andreasen requested review from a team as code owners August 7, 2025 14:21
@bjarki-andreasen bjarki-andreasen force-pushed the auto-manifest-sdk-zephyr-3175 branch from 809c4de to edd4d77 Compare August 7, 2025 14:24
@github-actions
Copy link

github-actions bot commented Aug 7, 2025

You can find the documentation preview for this PR here.

@NordicBuilder
Copy link
Contributor Author

NordicBuilder commented Aug 7, 2025 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 16

Inputs:

Sources:

sdk-nrf: PR head: 79c35ac80b4aba77055ea2008b65a06b34bdec19
mcuboot: PR head: 79aa4378c23543ce93458f495432da73ef9f5dcb
zephyr: PR head: 9f27eaa5907ec1e27288596b51a66575eeddaa09

more details

sdk-nrf:

PR head: 79c35ac80b4aba77055ea2008b65a06b34bdec19
merge base: 9c8e5e3d3e80ae1b560ade10a34955a1b05ea129
target head (v3.1-branch): 9c8e5e3d3e80ae1b560ade10a34955a1b05ea129
Diff

mcuboot:

PR head: 79aa4378c23543ce93458f495432da73ef9f5dcb
merge base: 05a633937029363ecb2208f9f855fe415f0038bc
Diff

zephyr:

PR head: 9f27eaa5907ec1e27288596b51a66575eeddaa09
merge base: 0351d6ecde6e92a5aa9be311a494b02c0e44eb53
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (60) 
bootloader
│  ├── mcuboot
│  │  ├── boot
│  │  │  ├── zephyr
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.overlay
drivers
│  ├── mspi
│  │  │ mspi_sqspi.c
samples
│  ├── zephyr
│  │  ├── subsys
│  │  │  ├── mgmt
│  │  │  │  ├── mcumgr
│  │  │  │  │  ├── smp_svr
│  │  │  │  │  │  ├── sysbuild
│  │  │  │  │  │  │  │ mcuboot_merged_slot.overlay
sysbuild
│  │ CMakeLists.txt
tests
│  ├── benchmarks
│  │  ├── multicore
│  │  │  ├── idle
│  │  │  │  │ testcase.yaml
│  ├── subsys
│  │  ├── nrf_compress
│  │  │  ├── decompression
│  │  │  │  ├── mcuboot_update
│  │  │  │  │  ├── sysbuild
│  │  │  │  │  │  ├── mcuboot
│  │  │  │  │  │  │  ├── boards
│  │  │  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.overlay
west.yml
zephyr
│  ├── arch
│  │  ├── arm
│  │  │  ├── core
│  │  │  │  ├── cortex_m
│  │  │  │  │  │ pm_s2ram.c
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf54h20dk
│  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.dts
│  ├── drivers
│  │  ├── adc
│  │  │  │ adc_nrfx_saadc.c
│  │  ├── can
│  │  │  │ can_nrf.c
│  │  ├── counter
│  │  │  │ counter_nrfx_timer.c
│  │  ├── gpio
│  │  │  │ gpio_nrfx.c
│  │  ├── pinctrl
│  │  │  │ pinctrl_nrf.c
│  │  ├── power_domain
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── Kconfig.nrf_gpio_pad_group
│  │  │  ├── Kconfig.nrfs_gdpwr
│  │  │  ├── Kconfig.nrfs_swext
│  │  │  ├── power_domain_nrf_gpio_pad_group.c
│  │  │  ├── power_domain_nrfs_gdpwr.c
│  │  │  │ power_domain_nrfs_swext.c
│  │  ├── pwm
│  │  │  │ pwm_nrfx.c
│  │  ├── serial
│  │  │  │ uart_nrfx_uarte.c
│  │  ├── spi
│  │  │  ├── spi_nrfx_spim.c
│  │  │  │ spi_nrfx_spis.c
│  ├── dts
│  │  ├── arm
│  │  │  ├── nordic
│  │  │  │  ├── nrf54h20_cpuapp.dtsi
│  │  │  │  │ nrf54h20_cpurad.dtsi
│  │  ├── bindings
│  │  │  ├── gpio
│  │  │  │  │ nordic,nrf-gpio-pad-group.yaml
│  │  │  ├── power-domain
│  │  │  │  ├── nordic,nrfs-gdpwr.yaml
│  │  │  │  │ nordic,nrfs-swext.yaml
│  │  │  ├── power
│  │  │  │  │ nordic,nrf-gpd.yaml
│  │  ├── vendor
│  │  │  ├── nordic
│  │  │  │  │ nrf54h20.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── devicetree.h
│  │  │  ├── dt-bindings
│  │  │  │  ├── adc
│  │  │  │  │  │ nrf-saadc.h
│  │  │  │  ├── power
│  │  │  │  │  │ nordic-nrf-gpd.h
│  ├── soc
│  │  ├── nordic
│  │  │  ├── common
│  │  │  │  ├── pinctrl_soc.h
│  │  │  │  │ soc_nrf_common.h
│  │  │  ├── nrf54h
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── Kconfig.defconfig
│  │  │  │  ├── Kconfig.defconfig.nrf54h20_cpuapp
│  │  │  │  ├── Kconfig.defconfig.nrf54h20_cpurad
│  │  │  │  ├── gpd
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── gpd.c
│  │  │  │  │  ├── include
│  │  │  │  │  │  ├── nrf
│  │  │  │  │  │  │  │ gpd.h
│  ├── subsys
│  │  ├── pm
│  │  │  │ Kconfig
│  ├── tests
│  │  ├── arch
│  │  │  ├── arm
│  │  │  │  ├── arm_interrupt
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.conf
│  │  │  │  ├── arm_irq_vector_table
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.conf
│  │  │  │  ├── arm_thread_swap
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.conf
│  │  ├── kernel
│  │  │  ├── threads
│  │  │  │  ├── dynamic_thread_stack
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.conf
│  │  │  ├── usage
│  │  │  │  ├── thread_runtime_stats
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpurad.conf

Outputs:

Toolchain

Version: c5be9c56c7
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:c5be9c56c7_bba2ea5f2e

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
  • ❌ Integration tests
    • ❌ test-sdk-audio
    • ❌ desktop52_verification
    • ✅ test-fw-nrfconnect-apps
    • ✅ test_ble_nrf_config
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-ble_samples
    • ❌ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ❌ test-fw-nrfconnect-nrf-iot_cloud
    • ✅ test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ test-fw-nrfconnect-nrf-iot_lwm2m
    • ✅ doc-internal
    • ❌ test-fw-nrfconnect-nrf-iot_thingy91
    • ✅ test-fw-nrfconnect-nrf_crypto
    • ✅ test-fw-nrfconnect-rpc
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-tfm
    • ✅ test-fw-nrfconnect-thread-main
    • ✅ test-sdk-find-my
    • ❌ test-fw-nrfconnect-nrf_lrcs_mosh
    • ❌ test-fw-nrfconnect-nrf_lrcs_positioning
    • ✅ test-sdk-wifi
    • ❌ test-low-level
    • ✅ test-sdk-pmic-samples
    • ❌ test-sdk-mcuboot - Error: Error starting job: Failed to trigger build of latest/sub/test-sdk-mcuboot/grch_23837_unclean_cherry_pick_of_power_domain
    • ❌ test-sdk-dfu
    • ✅ test-fw-nrfconnect-ps-main
    • ✅ test-secdom-samples-public
    • ⚠️ test-fw-nrfconnect-nrf_lrcs_mosh

Note: This message is automatically posted and updated by the CI

@NordicBuilder NordicBuilder force-pushed the auto-manifest-sdk-zephyr-3175 branch from edd4d77 to ffdf877 Compare August 7, 2025 15:46
@NordicBuilder
Copy link
Contributor Author

NordicBuilder commented Aug 7, 2025 •
edited
Loading

Memory footprint analysis revealed the following potential issues

applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 9090[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 5846[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 12430[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 9178[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 9090[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 5846[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High RAM usage: 12430[B] - link (cc: @nrfconnect/ncs-ll-ursus)
applications.hpf.gpio.icbmsg[nrf54l15dk/nrf54l15/cpuflpr]: High ROM usage: 9178[B] - link (cc: @nrfconnect/ncs-ll-ursus)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-23837/16)

@NordicBuilder NordicBuilder force-pushed the auto-manifest-sdk-zephyr-3175 branch from ffdf877 to 9bbfaf2 Compare August 11, 2025 09:41
@bjarki-andreasen bjarki-andreasen force-pushed the auto-manifest-sdk-zephyr-3175 branch from 9bbfaf2 to be22ee6 Compare August 11, 2025 09:41
@NordicBuilder NordicBuilder force-pushed the auto-manifest-sdk-zephyr-3175 branch from be22ee6 to 790f06a Compare August 11, 2025 10:14
@bjarki-andreasen bjarki-andreasen force-pushed the auto-manifest-sdk-zephyr-3175 branch from 790f06a to 39ce96e Compare August 11, 2025 13:34
@bjarki-andreasen bjarki-andreasen requested a review from a team as a code owner August 11, 2025 13:34
@NordicBuilder NordicBuilder force-pushed the auto-manifest-sdk-zephyr-3175 branch from 39ce96e to 6282263 Compare August 11, 2025 13:38
@NordicBuilder NordicBuilder force-pushed the auto-manifest-sdk-zephyr-3175 branch from 6282263 to 180712b Compare August 11, 2025 16:21
@de-nordic @bjarki-andreasen
bootloader: MCUboot: Replace CONFIG_NRF_BOOT_SIGNATURE_USING_ITS
eb6a8cc 
The commit replaces CONFIG_NRF_BOOT_SIGNATURE_USING_ITS
with CONFIG_NCS_BOOT_SIGNATURE_USING_ITS.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit caa716d)
@bjarki-andreasen bjarki-andreasen force-pushed the auto-manifest-sdk-zephyr-3175 branch from 180712b to ed9a5b9 Compare August 11, 2025 16:23
NordicBuilder and others added 5 commits August 11, 2025 18:24
@NordicBuilder @bjarki-andreasen
manifest: Update sdk-zephyr revision (auto-manifest PR)
a31b8b4 
Automatically created by Github Action

Signed-off-by: Nordic Builder <[email protected]>
@bjarki-andreasen
drivers: mspi: remove redundant gpd handling
d500483 
Manual handling of global power domains using gpd has been
made redundant by power domain and pinctrl refactoring, and gpd
has thus been removed. Remove gpd handling from mspi driver, as
this is automatically done by pinctrl_apply_state() now.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
@bjarki-andreasen
samples: smp_svr: extend mcuboot_merged_slot.overlay
209edf6 
The board overlay in bootloader/mcuboot for the
nrf54h20dk/nrf54h20/cpuapp platform is required, but ignored as
FILE_SUFFIX="merged_slot" matches the mcuboot_merged_slot.overlay
in this sample instead.

Copy the missing contents of the board overlay from
bootloader/mcuboot to mcuboot_merged_slot.overlay

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
@bjarki-andreasen
nrf_compress: decompression: mcuboot_update: adjust nrf54h20dk pd
35166d5 
Adjust nrf54h20dk/nrf54h20/cpuapp overlay and conf to include
required props from the overlay in bootloader/mcuboot. Specifically
disabling power domains.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
@bjarki-andreasen
benchmarks: multicore: idle: select PM_DEVICE_RUNTIME
79c35ac 
The global power domains require PM_DEVICE to be power managed.
Enable PM_DEVICE, and unselect the default, optional, not required
PM_DEVICE_RUNTIME_ASYNC feature.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
@bjarki-andreasen bjarki-andreasen force-pushed the auto-manifest-sdk-zephyr-3175 branch from ed9a5b9 to 79c35ac Compare August 11, 2025 16:25
@NordicBuilder NordicBuilder removed the DNM label Aug 11, 2025
@thst-nordic thst-nordic merged commit 22fabff into nrfconnect:v3.1-branch Aug 11, 2025
12 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nordicjm nordicjm nordicjm approved these changes

@nordic-segl nordic-segl nordic-segl approved these changes

@nordic-piks nordic-piks nordic-piks approved these changes

@gchwier gchwier gchwier approved these changes

@adamkondraciuk adamkondraciuk Awaiting requested review from adamkondraciuk adamkondraciuk is a code owner

Assignees

No one assigned

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-mcuboot manifest-zephyr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@NordicBuilder @nordicjm @nordic-segl @nordic-piks @gchwier @thst-nordic @de-nordic @bjarki-andreasen